auto merge of #301 : alexcrichton/cargo/lockfile, r=wycats
authorbors <bors@rust-lang.org>
Fri, 1 Aug 2014 22:29:29 +0000 (22:29 +0000)
committerbors <bors@rust-lang.org>
Fri, 1 Aug 2014 22:29:29 +0000 (22:29 +0000)
This PR is a series of commits building off the `lockfile` branch which finishes the work on the lockfile as well as implementing the `cargo-update` command.

This PR deprecates the `-u` flag in favor of the `cargo update` command.


Trivial merge